| commit | 1e868f87341adad554233fdb7448c3f41e7d3aa0 | [log] [tgz] |
|---|---|---|
| author | Natalie Silvanovich <natashenka@google.com> | Mon Mar 09 18:32:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 09 18:32:37 2015 +0000 |
| tree | da92d422c4fbfbfd7e8f577081691aac94ad2aa1 | |
| parent | 3210f865592835629eae0e172dc55bbe1a822041 [diff] | |
| parent | 0cd5a85ee83c1db54fb244300c072ef73c622861 [diff] |
am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing by default" * commit '0cd5a85ee83c1db54fb244300c072ef73c622861': Change pairing_cb to assume temporary pairing by default